From 9e94eef5317615a3bcb978155eaf23e9d34c82de Mon Sep 17 00:00:00 2001 From: Markus Rost Date: Thu, 12 Dec 2002 00:51:31 +0000 Subject: [PATCH] (set-language-info): Update custom-type of current-language-environment directly without a function call. (current-language-environment-custom-type): Deleted. --- lisp/international/mule-cmds.el | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index ed4e23497d1..508be261b1d 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el @@ -986,8 +986,13 @@ see `language-info-alist'." (setq key-slot (list key)) (setcdr lang-slot (cons key-slot (cdr lang-slot))))) (setcdr key-slot (purecopy info)) + ;; Update the custom-type of `current-language-environment'. (put 'current-language-environment 'custom-type - (current-language-environment-custom-type)))) + (cons 'choice (mapcar + (lambda (lang) + (list 'const (car lang))) + (sort (copy-sequence language-info-alist) + (lambda (x y) (string< (car x) (car y))))))))) (defun set-language-info-alist (lang-env alist &optional parents) "Store ALIST as the definition of language environment LANG-ENV. @@ -1487,15 +1492,6 @@ This hook is mainly used for canceling the effect of (customize-mark-as-set 'current-language-environment)) (error "Bogus calling sequence")))) -(defun current-language-environment-custom-type () - "Return a custom type for `current-language-environment'. -This is based on `language-info-alist'." - (cons 'choice (mapcar - (lambda (lang) - (list 'const (car lang))) - (sort (copy-sequence language-info-alist) - (lambda (x y) (string< (car x) (car y))))))) - (defcustom current-language-environment "English" "The last language environment specified with `set-language-environment'. This variable should be set only with \\[customize], which is equivalent -- 2.30.2